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

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



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