Merge "Prevent media button receivers targeting activities" into udc-dev am:...

Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8 am: 8b3d9dbf

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



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