Merge "Merge "Prevent media button receivers targeting activities" into...

Merge "Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8 am: ce5cba3c" into udc-d1-dev-plus-aosp am: b52934f8

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



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