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

Change-Id: I3301855d05bbaa22310b5f33d77fbd555fd6ab43