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

[automerger skipped] Don't allow core uids to be unfrozen due to deferrable broadcasts. am: 98897fea -s ours am: 5c8a0646 -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: I20a44e82b8420a26b30686ff1d6233e801f82094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>