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

Merge "Eliminate acquiring WM lock when bind/unbind service" into tm-qpr-dev am: db4b9c58 am: 22280a13 am: 92ce36a5 am: 1be795b1

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



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