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

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



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