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

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

Change-Id: Ia7b98b3f7b3cf711aaacbd306aae9be7d316b8e4