Merge "Use StorageManager#isUserKeyUnlocked to determine CE storage in PMS" into sc-dev