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

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

Change-Id: Ia997b5004ca98fb348ecccf7d46914db47812571