am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in...
am 4142d9b0: am 7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
* commit '4142d9b0':
Fix getStorageEncryptionStatus() in DevicePolicyManager