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

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

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



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