Merge "MediaRouter: Cleanup MediaRouter2Manager APIs" into rvc-dev am: f8ac47cd am: 19b9c7d4 am: d7f380a3 Change-Id: If087f0e6da3cd4de200a942d3e2f8c2de448a13e