Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: a5b0451eb6" into rvc-d1-dev-plus-aosp am: 57cb7595fa

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

Change-Id: I17714e9b83db6392431a8830441908a75763c7b5