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