Merge "Fix sticky unfreeze app failure" into main am: 4a2015f3da

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

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