[automerger skipped] Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" am: a68fba1659 -s ours am: 213c381c35 -s ours am: 5f1377d3d6 -s ours

am skip reason: Merged-In I4c204a8489c0be006c00581d833f2bb46ae0e71d with SHA-1 ea7e6d56f4 is already in history

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

Change-Id: I0841d93bddba643160e385193ecb511129d5f66d