Merge "[Output Swithcer] Add groupable routes when build list" into tm-dev am: 463ff8db am: 44d6e066

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17229074

Change-Id: Ic60cf1553fe68b3ca15413ce30937c677eac8130