[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 -s ours

am skip reason: Change-Id I5a537eca9b1aab3694a11a2dab147a31f289314c with SHA-1 d584d2fa36 is in history

Change-Id: I8127f6ddc3f6eeca415cc168c2653b839f86d541
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/