Merge "Update MediaRouter2Manager api" into rvc-dev