Merge "[SB Refactor] Always show the wifi icon if the device has no data...

Merge "[SB Refactor] Always show the wifi icon if the device has no data capabilities." into tm-qpr-dev am: ff008f07

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



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