Merge "Remove calls to client while holding lock" into tm-qpr-dev am: 0accc209

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



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