tree def6b9df47cce2e14294a9896b83d5f45163e041
parent f0ea201f810863651e75d01b29ac8bee7b7628d7
parent 050b1cf0935bf0b27216df7135b611800af31499
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714495107 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1714495107 +0000

Merge changes from topic "am-4cf049a70af84f399874d24073183df5" into main

* changes:
  [automerger skipped] Merge changes from topic "revert-25240035-anon_bt_address_tm_dev-YRAGLYKTNK" into tm-dev am: 41d861cc5e -s ours am: 1e4508148c -s ours am: 1006bb1a1d -s ours am: 2501f9d6cc -s ours am: 6f477f5574 -s ours am: 20d7ead8d7 -s ours
  [automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fea0 -s ours am: 4439d89139 -s ours am: 520d9dfa5b -s ours am: a23e3a9be9 -s ours am: 7730159c0b -s ours am: 96285b3a71 -s ours