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

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

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