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

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

Change-Id: I3fdc5962cba0066f5e58a656d4f130af1dc072b2