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

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

Change-Id: I0cbf82321fad067980bdba95cddcf8f44adc05e0