Merge "[automerger skipped] Merge "Cleanup the TetheredClients API" into rvc-dev am: 389714de am: ee28e4a7 -s ours" into rvc-d1-dev-plus-aosp