[automerger skipped] Merge "Don't allow core uids to be unfrozen due to...

[automerger skipped] Merge "Don't allow core uids to be unfrozen due to deferrable broadcasts." into main am: 054f4439 am: 53ff747b -s ours am: 18a0f827 -s ours

am skip reason: Merged-In I47ce6ea68e2716a320198c008752cfaa7dedbb81 with SHA-1 9a7407bc is already in history

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



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