Merge "Improve thread safety of ManagedServices.java" into tm-qpr-dev am: 3944b831 am: 6b395dbf

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



Change-Id: I27d09ca152bbdfd0300d73519050ae281f0194bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>