[automerger skipped] Merge changes from topic "ethernet_mainline" am: 6dde8ac532 am: db66fe0bd8 -s ours

am skip reason: Merged-In I5b61643cf99681e4db56468401e8670f90f9257e with SHA-1 5f2fc97e80 is already in history

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

Change-Id: I2ddbacf57dfde39bea815317aa997bbb4cef3d6f