Merge changes from topic "ethernet_mainline" am: 6dde8ac532

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

Change-Id: I96c3c720ca69eb76d2824ab9eb396f689e53bf09