Merge "Override tethering module APK-in-APEX for Go variant" into rvc-dev am: cca6aad882

Change-Id: I4513b6ad6895b7d2ddeff5405742f578baec700f

Tethering/Android.bp

@@ -109,6 +109,7 @@ android_app {
     manifest: "AndroidManifest_InProcess.xml",
     // InProcessTethering is a replacement for Tethering
     overrides: ["Tethering"],
+    apex_available: ["com.android.tethering"],
 }
 
 // Updatable tethering packaged as an application

Tethering/apex/Android.bp

@@ -36,3 +36,12 @@ android_app_certificate {
     name: "com.android.tethering.certificate",
     certificate: "com.android.tethering",
 }
+
+override_apex {
+    name: "com.android.tethering.inprocess",
+    base: "com.android.tethering",
+    package_name: "com.android.tethering.inprocess",
+    apps: [
+        "InProcessTethering",
+    ],
+}