Merge "Remove Tethering @TestApi" into mainline-prod