Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into...

Merge "Show mobile data icon with carrier Wi-Fi level in Quick-Settings" into tm-dev am: f5963865 am: 72645f44 am: c3756b1c am: b7bdc65b

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



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