Merge "Clean up MediaRouter2Manager" into rvc-dev am: 8a028947c3

Change-Id: I942d4468363cf7ce4fac5eb6f378bfad3b87858e