Merge "Apply proper locks onto the service/association state tracking" into sc-dev am: 365cc28b50

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475947

Change-Id: I0901375ae39ced3d3297d2fcae1783b8f84886af