Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am:...

Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db65 am: e5274933

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



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