Merge upstream ethtool v6.1 am: da43f89751 am: b893c14a44 am: 26a71cd59b

Original change: https://android-review.googlesource.com/c/platform/external/ethtool/+/2804540

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