Merge "Set CarrierTextManager.airplaneMode to true when wifi enabled while in...

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

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



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