[automerger skipped] Merge changes from topic "presubmit-am-7c4b9616a6bc4dd9b71492ee4ee7d2a5" into sc-mainline-prod am: 6d26c2c0f1 -s ours am: 5992e0e381 -s ours am: 9c063bdf65 -s ours

am skip reason: Merged-In I0bf17f837bfbe4e6558781d807509b2014658574 with SHA-1 1591891486 is already in history

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

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