Merge tag 'android-12.1.0_r1' of https://android.googlesource.com/platform/packages/modules/Connectivity into HEAD

Android 12.1.0 release 1

Change-Id: I5e28321bd2331f779815be5f670389efe92bef6d