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

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

Change-Id: I06da9a7492fb23e36cd4c67c4c8a696084c8695b