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