[automerger skipped] Merge "Add TetheredClient tests" into rvc-dev am: 34d6a00acb am: 1716344e59 am: 5c9e8dba7f am: 9b0f2ecbd9 -s ours

am skip reason: Change-Id Ic7cbebe54a38af5b5c4639eb7641a20de6864a26 with SHA-1 86152672a6 is in history

Change-Id: Id6fe36cacfc4a29f452b2fff5db974162950713d