Merge "Fix issue when adding existing connections via remote connection...

Merge "Fix issue when adding existing connections via remote connection services." into sc-dev am: 5f543519

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

Change-Id: I99a561193225b6abb9c3d9b36ca7a004406662f7