[automerger skipped] Merge Android 12 am: 7278efa321 -s ours am: 7aae12e960 -s ours

am skip reason: Merged-In I304701a1ad5be47bec534d679eca259b06cb084d with SHA-1 1932a7e7ec is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1847600

Change-Id: I4f00fcb0545243a24c34a063af1238ebda4ef3e0
tree: 36d2155349dd0583e671c49a7497863c5bd93a8e
  1. service-t/
  2. tests/