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

[automerger skipped] Merge "Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8 am: ce5cba3c" into udc-d1-dev-plus-aosp am: b52934f8 am: e482c4c1 -s ours

am skip reason: Merged-In I07c2521f3d97f94e245a25bbb6f49f75cf54a808 with SHA-1 fda5a94a is already in history

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



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