[automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a42 -s ours

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

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

Change-Id: I20dbc3c85f39170631de0715d0eb89daf302bf6a