[automerger skipped] Merge "Limit broadcast by user" into sc-v2-dev am:...

[automerger skipped] Merge "Limit broadcast by user" into sc-v2-dev am: c0b5023c -s ours am: cc0ca803 -s ours am: 05511ff7 -s ours

am skip reason: Merged-In Ie8d5d008141e69febe5216f49b127222d2bcb8cc with SHA-1 89f6161d is already in history

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



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