Merge "MediaRouter: Cleanup MediaRouter2Manager APIs" into rvc-dev am: f8ac47cd am: 19b9c7d4 am: b6705e9b am: 7fc30d1e Change-Id: I0c20261237b15d3510f997bfa7e6c6117b2a820c