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

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



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