Merge "Merge "Hide non transferable routes" into sc-dev am: 88146b483b am: 6ae49b4d9e" into sc-v2-dev-plus-aosp am: 79e422da66

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

Change-Id: I9feb408ad1fc58f06da77c8cb89471e772854c6d