Merge changes from topic "remove-ethernet-shims" am: 337d512081 am: 293129ca50 am: 266e3cc123

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

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