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

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

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