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

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

Change-Id: I8e8f8c6518c45130203df5aee8212041074f5c0b