[automerger skipped] Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" am: da9751f6e5 -s ours am: 2ad6db57ce -s ours am: 8951d3f124 -s ours

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

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

Change-Id: I11bcd3b940183431379ce47b737a45d6eb50e86e
tree: 11fa2f3d2769e07647d035ca2031cb3b2fd496ec
  1. framework/
  2. framework-t/
  3. service-t/
  4. tests/