[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours am: c5828ee024 -s ours

am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 21893f0ea5 is already in history

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

Change-Id: I591145e19a0dd5ffc59a58fed5e9dbb1b5156b43
tree: 5f18b1de597aa72651d1a5109bb9156861878406
  1. service-t/
  2. tests/