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: 41d861cc -s ours am: 1e450814 -s ours am: 1006bb1a -s ours am: 2501f9d6 -s ours am: 6f477f55 -s ours am: 20d7ead8 -s ours
  [automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fe -s ours am: 4439d891 -s ours am: 520d9dfa -s ours am: a23e3a9b -s ours am: 7730159c -s ours am: 96285b3a -s ours