Merge "MediaController2: Add @Nullable to getConnectedSessionToken()"