[automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: bfd392c4c0 am: b8345314d8 -s ours am: f21b93a7f2 -s ours am: 896b666cf4 -s ours am: 607ebd5b7f -s ours

am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: Id9394b10a25fbab0b1262d27c7fea1b48d0cbce8
tree: ed028988fc328302897f66e6593d900b2733a576
  1. Tethering/