[automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c00b -s ours am: 1d569978b7 -s ours am: 28f0b43a6e -s ours am: c739ccfa88 -s ours am: ab3340678a -s ours

am skip reason: Merged-In I4aba866a9758366175ea4af0d434729ad98fa48d with SHA-1 863d396f4c is already in history

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

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