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

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



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