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

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



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