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

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

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