[automerger skipped] Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8ed am: 8b3d9dbffb am: 7bc900e494 am: 1c789ac458 -s ours

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

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

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