Merge "Re-evaluate frozen state in CAO.onCleanupApplicationRecordLocked" into udc-dev am: 84647eb97b am: cd482d406e

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

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