Merge "Add self-managed connection service API."
am: 9f07a4ece2

Change-Id: I997fb384a6fffc8770a5376958ee66e985f89ab4