Merge "Check for new media session token" into rvc-dev am: 613b829a am:...

Merge "Check for new media session token" into rvc-dev am: 613b829a am: 4170f261 am: 5628bd37 am: 4135cc7f

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

Change-Id: I8a83f60e9d9e2cb09fa57df9da1b5c13ea7b105f