Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8 am:...

Merge "Show 4G LTE and 4G LTE+ data connection type" am: c5fbfeb8 am: aad97149 am: 6000d955 am: 035a0252 am: 5638f16f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934942



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