Merge "Revert "Include both eth%d and usb%d ethernet interfaces on U+"" into main am: 783035bd

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



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