Merge "[Provider Model] Show airplane off button and carrier network if...

Merge "[Provider Model] Show airplane off button and carrier network if airplane mode is on" into sc-v2-dev am: e2536dfa am: 339e7e50

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

Change-Id: I74a6af936e17493fc7938a55b182879212b3685a