[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 -s ours am: a00c06ae -s ours am: 0e16e8c5 -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: I9f0a254169da0bf5fb37dfec22d2d7155637ae74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>