Merge "Use isCeStorageUnlocked() in AppDataRollbackHelper" into main am: e1b02f1763 am: d0e7c006a5

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

Change-Id: I8d0f00e0f251725bbbad64b8cd5054a3e1bb0a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>