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 am: 2136f029 am: 53ab9dfe

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

Change-Id: I90fbbfa6cc5b238d0f4dcbfe6a0736d7955bf0af