Merge "MediaController2: Add getConnectedSessionToken()"