[automerger skipped] Merge changes from topic "cts-snapshots" am: 07f97b249c am: fd242c77b1 -s ours am: 58058998db -s ours

am skip reason: Merged-In I90d47ac9bd0570c0aed19402fa9be4e99e0f8621 with SHA-1 056b6649cd is already in history

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

Change-Id: I8fee9b5d7f9ae80571d44226b4eb21af682c31cf