Merge "Merge "Merge "Fix unbind crash in AbstractRemoteService." into tm-dev...

Merge "Merge "Merge "Fix unbind crash in AbstractRemoteService." into tm-dev am: dc9db874 am: c3d3577b" into tm-d1-dev-plus-aosp am: daf27492" into tm-qpr-dev-plus-aosp am: 12b82772

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



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