Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: 60f6dc69ff am: 31582220cf

Change-Id: I9bbf6673c44ea94193e287e849742754a0e0f14a