commit 03b62a0c87f44f19125f54ea516c162b76d0c58e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 03 17:01:26 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 03 17:01:26 2022 +0000
tree 19d6562146286b6acebddfc63714fb6119e031ca
parent d16afff40e069a43e0bd09005307c55caf90ece2
parent bf3376106fef6492da31ef672e8a4a334118531c

Merge changes from topic "am-827479f2da4c4715bbb9ef845df51d94" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Ignore new EthernetManager test until prebuilts are updated. am: 61408d30f6 -s ours am: 0e7fdd7558 -s ours am: 368cf911d7 -s ours
  [automerger skipped] ethernet: add test for tethered interface callbacks am: bd7a9c2596 -s ours am: cfe43af516 -s ours am: d7e1ba3c2f -s ours
  [automerger skipped] ethernet: stop using EthernetManager shims am: 81b4b38067 -s ours am: 9bf36d3e9e -s ours am: 04790d099a -s ours
  [automerger skipped] ethernet: broadcast state change for server interfaces am: 1f8bd41e87 -s ours am: 253b467182 -s ours am: c74382e763 -s ours
  [automerger skipped] ethernet: increase timeout to deflake tests am: 227dfb5ad0 -s ours am: f20a833f50 -s ours am: 6ddddc17c8 -s ours