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: 8f900a50

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

Change-Id: Id6e2277916a37695e95251f9c936b7acd011bfdb