Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154 am: 458d37d5bb am: d384468742

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

Change-Id: I610222c58a11a965edd6cdfeaa7ca4994b4ade4a