Merge "Update MediaRouter2Manager api" into rvc-dev am: 672fe2ae am: 9f7f1a0a am: 7c144f5e am: 966b4cf9 Change-Id: I7f75e6abfcd477d6afb56e889ae099cca4ffa4cd