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