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

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



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