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: 174414c4 am: 11265e05

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

Change-Id: I38475249dc66e70e5963479ffc410198dfaaa808