[automerger skipped] Merge "[DO NOT MERGE] Override a sendBroadcastUser()...

[automerger skipped] Merge "[DO NOT MERGE] Override a sendBroadcastUser() variant in BroadcastInterceptingContext." into tm-mainline-prod am: 746e7cfe -s ours

am skip reason: subject contains skip directive

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



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