Merge "Update MediaRouter2Manager api" into rvc-dev am: 672fe2ae am: 66f74699 am: f6318d2d am: fc073c16 Change-Id: Ie6bb2b72881148cb3d055252dc2d4b2f4ad1453b