Merge "[Android U][eSIM] Modify esim and sim card strings as part of esim primary" am: b80dcd127a am: b8c44d8a0d am: ee240b1a70

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

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