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

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



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