Merge upstream tag ethtool/5.4 am: b9157b24d4 am: 3c0d11a413 am: 6d63572fca

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

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