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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15561924

Change-Id: I64c33efc374f9638d1ccca79bf4e3bebc9f89875