Merge "Fix incorrect usage of lock object" am: d09e4c7bbe am: a47acb652e

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1379176

Change-Id: I223f167e051f9f34cb67e4f089244e723203a825