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

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

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