[automerger skipped] Merge "Fix potential deadlock accessing the value of...

[automerger skipped] Merge "Fix potential deadlock accessing the value of ICCID" am: d497807e am: bfa603a7 -s ours am: 9177ff6d -s ours

am skip reason: Merged-In Id0ba8cc1612681a3f83e4d1e340374e8b8f39027 with SHA-1 d1c9ec86 is already in history

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

Change-Id: Ia533388bef14ccbfc7151dbd8e666a21bde6fba7