[automerger skipped] Checking if package belongs to UID before registering broadcast receiver am: 4f0dc37b89 -s ours am: f65a29538b -s ours am: af9865179c -s ours am: 30e085414a -s ours am: 1103c65a28 -s ours

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

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

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