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

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

Change-Id: I78c3dfc8d01f30d4d99a29f0dc1419ef5ebc6483