Merge "Do not block for connector in TetheringManager" am: 6674b930fd am: bd9b1908fb am: e094cf9519

Change-Id: If1187beb53716d2c8f9855634a9b913ffceee604