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

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

Change-Id: Ifa886ed5b7941933b0c3f476f6a7b276bc0605f5