am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev

* commit '15635728a4ff00da6cc3d6468c02d39e5631f124':
  Update MediaRouteChooserDialog grouping UI