Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp

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