Merge "Add nullability annotations to public methods of ConnManager." am: 805e2ad9db
am: 59c8590f7b

Change-Id: If2e704e1f8ddf504be9e777ec226b2ce524438dc