Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc741 am: a5b0451e" into rvc-d1-dev-plus-aosp