[automerger skipped] Merge changes from topic "presubmit-am-7c4b9616a6bc4dd9b71492ee4ee7d2a5" into tm-dev am: 8b08fa9d30 -s ours am: 94c50059be -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: Id04422911bd2aa1d1b63ec279b41490516e782d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>