[automerger skipped] Merge Android 12 am: 7278efa321 -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: I173b718a156ec9c8a4255aba9bdc13726be074eb
This commit is contained in: