Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044



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