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

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

Change-Id: I17500658707b0ffe9e21ee26014407725edfbcd5