Merge "Merge "Always display the default network" into sc-dev am: 945334a3 am: 94c6e8d3" into sc-v2-dev-plus-aosp am: a88109a6

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

Change-Id: Ibc3613b256d940491f9333eb648f777b059c1767