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