[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 -s ours am: 44019d6bab -s ours am: 0e8ea95ec3 -s ours

am skip reason: Change-Id Iecf65859cdeeaac2fa7b817b4f505c510424ac89 with SHA-1 0010ca0c70 is in history

Change-Id: I67fa4221a36d685fc0d8c2cd17fa9f5cef26ba7a