[automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs...

[automerger skipped] Merge "Enforce MediaButtonReceiver ComponentName belongs to app" into sc-dev am: 047202c0 -s ours am: 1d569978 -s ours am: 28f0b43a -s ours am: c739ccfa -s ours am: 4994aca3 -s ours

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

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



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