Merge "Apply proper locks onto the service/association state tracking" into sc-dev am: 365cc28b50 am: 773cf25025

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

Change-Id: I3c08c19ec004de7e1607b9fdef1b513be75dc501