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 am: dc37d51b

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



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