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

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

Change-Id: I1a63b9d82fd530af87c2c70ab21e24e599a967e2