[automerger skipped] Checking if package belongs to UID before registering broadcast receiver am: 8bf1ae31 -s ours am: 4f7a5ec3 -s ours am: e358ab31 -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: I812f8aaca84a4419fea4d8b8bfd4969de28a614d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>