[automerger skipped] Merge "Add tethering client callbacks" am: 195fc89155 am: 6b281c9304 am: 3883a5ce7b -s ours
am skip reason: Change-Id I96291038cf7b39a67547a5f74fcd7cbedc1ca002 with SHA-1 43b0e5c6c7 is in history

Change-Id: I046ad2de1e65468df9f70f189abfa1162f15a7c0