Merge changes from topic "ethernet_mainline" am: 6dde8ac532

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

Change-Id: Ibc791ac71dc709d5e9f93437cf27c0f5fbd568cc