Merge "Apply proper locks onto the service/association state tracking" into...

Merge "Apply proper locks onto the service/association state tracking" into sc-dev am: 365cc28b am: 37d1776b am: d7d5618d

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

Change-Id: If1ad7097b8fbed98a5c308f36b2aa35cbd6b2ec0