Merge \"MediaRouter: Select/unselect route controllers for the updated route group\" into nyc-dev
am: f6a4ad301b

Change-Id: I40ccaf30c519305db409a8e0c2e06c0581a4378e