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