[automerger skipped] Merge changes from topic "dscp-cts13-r2" into...

[automerger skipped] Merge changes from topic "dscp-cts13-r2" into android13-tests-dev am: 68e3c3c6 -s ours am: 1c408375 -s ours am: ac529782 -s ours

am skip reason: Merged-In I1d2bfd52e05c334f9808e60455c346b4dca18cf7 with SHA-1 1bba92f1 is already in history

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



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