Merge changes from topic "am-5de743b640c4436eb27171a969fde82c"

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b147b224dae54740a8f3d8017cf416c9-sc-v2-dev" into sc-v2-dev-plus-aosp am: d53d3986 -s ours am: 8572affd -s ours
  [automerger skipped] [automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877 am: 34f0951f -s ours am: 2f137b63 -s ours