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: b310abfd am: 820fe170 am: 744d41b7

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

Change-Id: I4786099a655b23d9b5eca7077adadb35435ef65c