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

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

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



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