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

Change-Id: I156f825d4f878ef9de394b38abb934de96b01038