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

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



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