Merge "[Provider Model] Should show "Connected" and highlight carrier layout as well if connected to W+" into sc-qpr1-dev am: 2494a83924

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

Change-Id: I237e606866e571d8fca3542e301c0dd0fc7d3150