tree 9520e8b682511e00bbdc6229cc1bb5655b612a89
parent 92baba470ce233b9ad059f0ee266883ffc1aa0d2
parent 81bd4aa6715d423001d4fce3c863a8b1472e3304
author Aritra Sen <aritrasen@google.com> 1694602432 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1694602432 +0000

Merge changes I52a2d86e,I81268b4d into main

* changes:
  Revert "Move fallback device logic into ActiveDeviceManager"
  Revert "Reduce the use of locks to avoid deadlock"