Merge "[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 677a3b5e92 am: ee28e4a7a1 -s ours" into rvc-d1-dev-plus-aosp am: 0b633a8f69 -s ours

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

Change-Id: Ife2df361a806e96893b08b794794a3dff625fe69