[automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2 am: 34f0951f96 -s ours

am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 52e0dafcb3 is already in history

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

Change-Id: I8fb4325dae33c39709ee59f5557f708a06b6321c