Merge changes from topic "ethernet_mainline" am: 6dde8ac532 am: bf25e1ba38

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

Change-Id: I9fbb5de0354251a0fb011b1bd2cfd66a14c6344d