Merge "Fix memory access violation in NetworkStack" am: fc592e8b am:...

Merge "Fix memory access violation in NetworkStack" am: fc592e8b am: d417b647 am: 705d0a96 am: a82bee5d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: Iccc8e7325eed46b0ee8adb46e60ad4ae5067f753

Tethering/jni/com_android_networkstack_tethering_BpfUtils.cpp

@@ -183,7 +183,7 @@ static jboolean com_android_networkstack_tethering_BpfUtils_isEthernet(JNIEnv* e
             return false;
         default:
             jniThrowExceptionFmt(env, "java/io/IOException",
-                                 "Unknown hardware address type %s on interface %s", rv,
+                                 "Unknown hardware address type %d on interface %s", rv,
                                  interface.c_str());
             return false;
     }