[automerger skipped] Merge "Remove calls to client while holding lock" am:...

[automerger skipped] Merge "Remove calls to client while holding lock" am: 795e90b7 am: bef49934 am: 9e2b8ba3 am: a01602ca -s ours am: dfcf0bee -s ours

am skip reason: Merged-In I6c6c13e254cb048aebc63cb594b0c4658cf86b91 with SHA-1 b927ac9f is already in history

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



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