[automerger skipped] Merge "Checking if package belongs to UID before registering broadcast receiver" into tm-qpr-dev am: 7a6e4405 am: 7d982a64 -s ours

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

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



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