[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-dev am: 7a9f0ea1 -s ours am: 93dc567e -s ours am: 959b2b4e -s ours

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

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



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