Merge "[SB Refactor] Account for underlying wifi networks in old pipeline." into udc-dev am: 55282bc6 am: 174ec901

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



Change-Id: Id539019c600ae6fbad35d13ae02faa1dc71c0df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>