Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d
am: dd1ad333a8
am: 7a8d582874
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>
This commit is contained in: