Merge "Apply proper locks onto the service/association state tracking" into sc-dev am: 365cc28b50 am: 37d1776bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475947 Change-Id: I78e87149e84023590c4acc21aed78d537c37ac33
This commit is contained in: