[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-v2-dev am: 150fdbd6 -s ours am: 3cdc6cc5 -s ours am: ebe23d6b -s ours

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

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



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