Merge "Fix incorrect usage of lock object" am: d09e4c7b am: a47acb65 am: f15354a1 am: d285e130 am: f9a61c72

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

Change-Id: I1227794c824b014e53592b8b10576e71dfd2604d