[automerger skipped] Merge "Revert^2 "Change Ethernet API to use...

[automerger skipped] Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" am: 6c21b2bf -s ours am: cc354b1a -s ours am: ea758134 -s ours am: 658f0208 -s ours

am skip reason: Merged-In I7c46545a47034be409071c2ec007d9e1480c6ed0 with SHA-1 eea9edf7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031104

Change-Id: Icd25827fca92cbfd3522c0d6f54529ffdf52f3f5