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

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

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