Merge 37ccd4 into goog/master

Conflicted with Ifd6cfc77acf2284804a2f64011c2733b5c222369

Test: m
Change-Id: I2cb428a8cf6f194f2c33106df4610e0956bc994c

Tethering/Android.bp

@@ -20,12 +20,14 @@ java_defaults {
     srcs: [
         "src/**/*.java",
         ":framework-tethering-shared-srcs",
+        ":net-module-utils-srcs",
         ":services-tethering-shared-srcs",
         ":servicescore-tethering-src",
     ],
     static_libs: [
         "androidx.annotation_annotation",
         "netd_aidl_interface-java",
+        "netlink-client",
         "networkstack-aidl-interfaces-java",
         "android.hardware.tetheroffload.control-V1.0-java",
         "tethering-client",