[automerger skipped] Merge "Fix TetheringIntegrationTests failure" into rvc-dev am: f571504457 am: 231005897e am: 6c156c85cf am: 65e78f0ccf -s ours

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

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