[automerger skipped] Merge "Prevent media button receivers targeting...

[automerger skipped] Merge "Prevent media button receivers targeting activities" into sc-dev am: 0e7b7f8d am: 39b397e8 am: 242c2350 am: 99619bea am: 058ffb9a am: e7115fc6 -s ours

am skip reason: Merged-In I2412633c0b3afda6776244c72043d0dd78a4c8a1 with SHA-1 4a1e3f85 is already in history

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



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