Merge "Merge "Re-evaluate frozen state in...

Merge "Merge "Re-evaluate frozen state in CAO.onCleanupApplicationRecordLocked" into udc-dev am: 84647eb9 am: baa4f49e" into udc-d1-dev-plus-aosp am: 1871c2ce

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



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