Merge "Override tethering module APK-in-APEX for Go variant" am: c766c8e766

Change-Id: Iff6db0c1f58356a0e573654175c3780b8fa09a66