commit fe7707b2e62252cb3ae83ba66c715ecb440931e3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 22 18:13:49 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 22 18:13:49 2024 +0000
tree 37ba1517f7bdf324048af6f6c2e35ecbc994a2bc
parent 6a40f829acf5ea2a11b3b52d55b4d40f8fdad77c
parent 80346333ee105d65f9301d8c9980c8a1fa007113

Merge changes from topic "am-024503fe6dda429ca9f37b0e8482a58a" into main

* changes:
  [automerger skipped] Merge "Restrict USB poups while setup is in progress" into sc-dev am: bcfd8ebd66 -s ours am: 1ecab6ee9c -s ours am: abd3331d1c -s ours am: 85435f9264 -s ours am: 2ab45c001f -s ours am: 853ca0192c -s ours am: 0660af963e -s ours am: 946ef5c09e -s ours
  [automerger skipped] Restrict USB poups while setup is in progress am: ec96cc3e3a -s ours am: f0af3edb07 -s ours am: f1fea109a9 -s ours am: 67522a0d26 -s ours am: ec7fcb181a -s ours am: d05a05993f -s ours am: 568f2de45b -s ours am: 3485958559 -s ours