[automerger skipped] Merge "Checking if package belongs to UID before...

[automerger skipped] Merge "Checking if package belongs to UID before registering broadcast receiver" into sc-qpr1-dev am: cb603fa9 am: 0be797c6 am: 126a0dc5 am: 124db9b3 -s ours am: 7166ea43 -s ours am: 6d971ebf -s ours

am skip reason: Merged-In Ia525f218a46f8bf7fff660cec0d6432f09fdf24d with SHA-1 e94b6b90 is already in history

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



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