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

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

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