Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8ed am: 8b3d9dbffb am: 7bc900e494

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

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