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: 7f8b3749 am: 3e671081

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

Change-Id: I39025413c2847e77eadf171d3fcf8f8a8f81e190