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

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

Change-Id: I80ff4b4eb916e65c86ce9fe0345b80eee4931de7