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

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

Change-Id: Id66edb765d9ceae593b56a79afd4c64d5a81726e