Merge "Merge "Exclude MediaSession2 from the media button session" into...

Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc741 am: 458d37d5 am: d3844687" into rvc-qpr-dev-plus-aosp am: 9906d7d9

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

Change-Id: I0eb956cd05a37f53558f34f639e707312b5b266b