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

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

Change-Id: Ibc485cc77044063603c5164104cd19c1349f0650
tree: 4afbed056479653062cfe206a6965421acd9ba01
  1. Tethering/