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 am: 242c2350 am: 99619bea am: 058ffb9a

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



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