[automerger skipped] Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev am: cbb04a4286 -s ours am: 076a758f5d -s ours am: 329ed6ef8e -s ours am: 2d795b5ecf -s ours
am skip reason: Merged-In I6a8c01390130bcec9aff1460004343ca2b207031 with SHA-1 efc50877d2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988
Change-Id: I04ab43c21f1864fb747def1c365edd17e4fbe17b
This commit is contained in: