Merge "Set CarrierTextManager.airplaneMode to true when wifi enabled while in airplane mode" into udc-dev am: e5f70f24 am: d8266e6b

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



Change-Id: I9ca16b30d2a09a112c44655e16b213b3d79e0052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>