Merge "Fix SecurityException in getStorageEncryptionStatus" into nyc-dev