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