Merge changes from topic "remove-ethernet-shims" am: 337d512081

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

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