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: 749c2ddd am: aa0205da am: 3279e1a2

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



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