[automerger skipped] Merge "Create all variants of stubs for tethering" am: 9814b482cb am: dfc41a2298 -s ours

am skip reason: Change-Id I0ed44691b4e7080818442a9d0eb37d874f707195 with SHA-1 6a9c68b619 is in history

Change-Id: I857b4d6c0e7bbfc894219b4d0f9dc6997202ab58
tree: 5e88bcc23dc9ac6c8e31beb025c18cb903574ae5
  1. Tethering/