Merge "Merge "Fix potential deadlock accesing the value of ICCID" into sc-dev...

Merge "Merge "Fix potential deadlock accesing the value of ICCID" into sc-dev am: 5f8529e2 am: e1bf60b8" into sc-qpr1-dev-plus-aosp am: b3371ba8 am: 1b1487c4

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

Change-Id: I9f1db36e27f43f4da92d0b7007da148e3aa74b18