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

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



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