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: 9be7b923 am: fce465d4 am: fff8d3bf

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



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