Merge "Use unchecked admin lookup for getStorageEncryption()"