[automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2

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


Change-Id: If7c0bf7ab6c89e98bdecbc1ef98bf93313fa8176
Merged-In: I6a8c01390130bcec9aff1460004343ca2b207031