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

Change-Id: Ifff5f1f0ed7417ba52f424e17fd9e5e32ee44b45