Merge "[Provider Model] Fix the issue of turning off carrier network" into sc-qpr1-dev am: af065728bc am: c8e002d595

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

Change-Id: I393ea70fed77366f117d17fa8b1466e92b3cdeb3