Merge "[Settings] Should show carrier network if airplane mode is on" into sc-v2-dev am: 1df187a439 am: 4aef8765dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16332786

Change-Id: Ic4648dad4fd7950510fea2382fa990efe900baf8