Merge "Change the location of lock" am: 2a10f4b1 am: f76ff849 am: 38adfc22

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



Change-Id: I28344afde5274f1695d714590c4d01c9e287cca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>