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

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

Change-Id: I2d102fff27014a000f0eba7dc049bd955c56fdde