[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 skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 9548c8580c is in history

Change-Id: I405a67cc3184fdacc52be43b7f870fb99ecf2e54
tree: 5d0612dc8107e36daf9db63cf8e6d38227103359
  1. Tethering/