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

Change-Id: I1e4f8f901cfa8aa6c11864969a4895a441b22e6c