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: I99b99dbf097d3fb228818d0da09e375f66730672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>