Merge "Remove unecessary locking to avoid dead lock. am: 69eb0eb6 am:...

Merge "Remove unecessary locking to avoid dead lock. am: 69eb0eb6 am: 9c5d818e" into rvc-qpr-dev-plus-aosp am: 249300e0

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

Change-Id: I08cce4793a30b1b3f527b52098f29b54053c4cc0