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 am: e0eaef77

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

Change-Id: I81bf6b4b76baab4a7a7badfad8a6746571f36b30