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

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

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