Merge "Merge "[Provider Model] Don't show Wi-Fi icon if the level is -1" into sc-qpr1-dev am: ebd9d182d0 am: d243cf504c" into sc-v2-dev-plus-aosp am: b56363df47

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

Change-Id: I128a6935df295cb5a3af89376976b7e66ce109f7