Merge "Update MediaRouter2Manager api" into rvc-dev am: 672fe2ae am: 9f7f1a0a am: 65c5c5cb am: 079feba9 Change-Id: Iaec802ab8d2f5d2664772c6c860aed0243bac4cd