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: a5b0451e" into rvc-d1-dev-plus-aosp am: 57cb7595 am: c1bf431c

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

Change-Id: Id3cf7b05eff928f0ae8460575cffd774da0723ac