Merge "Avoid connecting the device again when the device is already connected" into sc-v2-dev am: 26af3f18

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

Change-Id: I609ba8ea403a085eb7166b872ec70cb3bb538229