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

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



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