[automerger skipped] Merge changes from topic "am-c303f6a44dec4ecfb78a44add2e42c2c" into tm-d1-dev-plus-aosp am: abdc0396ba -s ours am: cb5e125aaf -s ours

am skip reason: Merged-In Ic956b5e52575a467b405fecf142c7f25925358d4 with SHA-1 9e560d24c2 is already in history

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

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