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

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

Change-Id: I36d57341b964485b4067f86a002657b6606e6031