Merge "MediaRouter: Cleanup MediaRouter2Manager APIs" into rvc-dev