Merge "Fix sticky unfreeze app failure" into main am: 4a2015f3 am: 7d28749d am: edce2918

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



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