[automerger skipped] Merge "[Android U][eSIM] Modify esim and sim card strings...

[automerger skipped] Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: 5a34a5b3 am: 38d97f78 am: dce53c2f -s ours

am skip reason: Merged-In I984d56e724dbd906e48358a31c6a7cb1e5db4fdf with SHA-1 ecdfe28b is already in history

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



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