Merge "Remove calls to client while holding lock" am: 795e90b78e

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

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