[automerger skipped] Merge "Limit broadcast by user" into sc-v2-dev am: c0b5023c -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: Id7f3d195cf7f05895fe9230683f0775a30827a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>