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: d0cc7151

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



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