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

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

Change-Id: Idd5b138fce179c3ee0df9a21f1a9b8fa3011c855