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: de1ba7df

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

Change-Id: Ic619cc99c38c27265d70f0c3a539602d1f22c532