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

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

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