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

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

Change-Id: I415be7f49030b01909b0ce13c535f1a1bee5ba6c