[automerger skipped] Merge "Enforce MediaButtonReceiver extracted component...

[automerger skipped] Merge "Enforce MediaButtonReceiver extracted component name matches session package name" into sc-dev am: be6425b8 -s ours am: 50cff170 -s ours am: 76a4c2fc -s ours am: 263814a9 -s ours am: efe5ae90 -s ours am: 5439b669 -s ours

am skip reason: Merged-In Ifac9cf53889222e31d18c14c1e096ee68c0a346c with SHA-1 48c38827 is already in history

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



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