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

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

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