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

* changes:
  [automerge] Avoid connecting the device again when the device is already connected 2p: 38c191d6
  Avoid connecting the device again when the device is already connected