Merge "[SB Refactor] Don't display the wifi icon if wifi isn't default." into...

Merge "[SB Refactor] Don't display the wifi icon if wifi isn't default." into tm-qpr-dev am: c23daaa7 am: 2fe46e15 am: b755b28b

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



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