Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev