Merge "Do not display "Network Available" when WiFi disabled." into sc-qpr1-dev am: b8655177fe

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

Change-Id: I5dd34e8b04a7097fa6df658bb9e46781f2cce832