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

Change-Id: Id5444dabe26a46a703edc54f9713531a63f9e211