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

Change-Id: I8f5cc35869b4b76404190709206cccd895a1d4b4