[automerger skipped] Merge "Do not apply background rules for core uids" into...

[automerger skipped] Merge "Do not apply background rules for core uids" into main am: 72719079 am: d85e3742 -s ours

am skip reason: Merged-In Ibe50b806a0632d09772e7e2e8deea6d2fefdc946 with SHA-1 da8a8cb6 is already in history

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



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