[automerger skipped] Merge "If signal is lost, do not update the empty country...

[automerger skipped] Merge "If signal is lost, do not update the empty country iso for other slots" am: d1c34f89 am: 6de8afe7 am: 9ae384c0 am: acd82357 -s ours

am skip reason: Change-Id I29efd0031f26fa94731b12d9865f1ab44a5ebd75 with SHA-1 bb4cd887 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1610556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd24145109acadf9a3457eac348ecafedbe26e50