3836c9a4c1
This fixes a bug introduced by a change where the function ignores systems with default encryption where it's disabled. The fix also checks to see if vold thinks the device is secure. Fixes bug 17881324 Change-Id: I2c40f76cf990d90d1a825955aa3b080b21684426