Merge "Fix issue when adding existing connections via remote connection...

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

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

Change-Id: Ic94e7ded1d8b1afc4c1e063b60c5b30a467b466e