Merge "Sort routes in the chooser dialog, ignoring case differences" into nyc-support-25.1-dev
am: 8268a5f312

Change-Id: I0336efa22e94268a68baab58d5fc69b1e3a4c79e