Merge "Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc741 am: 458d37d5 am: d3844687" into rvc-qpr-dev-plus-aosp