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

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

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