Merge "Eliminate acquiring WM lock when bind/unbind service" into tm-qpr-dev am: db4b9c58

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



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