Merge changes from topic "sysui-networking-refactor" into sc-v2-dev am: aaf2ae3c4c am: 9ad1785131

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

Change-Id: I24716de2aff354bb2d1da8f11cb39d5fb294ed06