am b31a2790: am c3024fa8: Merge "Enhance support for filtering routes in route chooser dialog."

* commit 'b31a27901310ccea61177e6e8f7b2e8c88c28019':
  Enhance support for filtering routes in route chooser dialog.