[automerger skipped] Merge "Override tethering module APK-in-APEX for Go...
[automerger skipped] Merge "Override tethering module APK-in-APEX for Go variant" am: c766c8e7 am: 52f150f7 -s ours
am skip reason: Change-Id I4147173b5f3668491ff9cb7f1f86715b036d6d4b with SHA-1 523616a2 is in history
Change-Id: I115a3426c92c4c7bfe78e3318b6ecf6cfcbe2d5d