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 am: 0235811f

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



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