[automerger skipped] Merge "Merge Android 13 QPR2" am: b7b1fce206 -s ours

am skip reason: Merged-In Id0876b10d9a4199419b5ae9d11876d32e3da3f0c with SHA-1 ff271d9bbd is already in history

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

Change-Id: I8f520ce6735829eec3dcc656d7a505d0f7e2cb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>