Merge "Check media session token type" into sc-v2-dev am: 313b9e92 am: f784affa

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

Change-Id: I7a6397d336f1779d8975b0b1ed0e20d904a81453