Merge changes from topic "ethernet-move-stage-aosp-master" into stage-aosp-master am: da46118757

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

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