Bug: 153614365 Bug: 153613717 Test: atest CtsTetheringTest Change-Id: I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 Merged-In: I26c06d522ef2935deb2b1abbd3c5b6be97a48a27 (cherry picked from commit 9903c8a61b, aosp/1292434)
9903c8a61b