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