Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim...

Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: b80dcd12 am: b8c44d8a

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



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