[automerger skipped] Merge changes from topic "ethernet-move-stage-aosp-master" into stage-aosp-master am: da46118757 am: 266695c645 -s ours

am skip reason: Merged-In I06e2568e5e01d855783383552d1b0d7732cefbe0 with SHA-1 66c958cf4f is already in history

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

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