Merge "[Status Bar] Allow carrier merged to be displayed even in airplane...

Merge "[Status Bar] Allow carrier merged to be displayed even in airplane mode." into udc-qpr-dev am: 0a65c06d am: db7a5467

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



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