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

Change-Id: I046ad2de1e65468df9f70f189abfa1162f15a7c0
tree: e9a016091cd4f28c8689804f0a6fb0ce84d4059c
  1. Tethering/