Merge "MediaRouter: Cleanup MediaRouter2Manager APIs" into rvc-dev am: f8ac47cd am: 2a4aba32 am: ea80ccb8 Change-Id: I0380ea19e438d2244f2edde04cb2c65e6423b4cc