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

Merge "Prevent media button receivers targeting activities" into sc-dev am: 0e7b7f8d am: 39b397e8

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



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