Merge changes from topic "am-4261e3f2d63b49e48a1331a62fa9342b" into main

* changes:
  [automerger skipped] Merge changes from topic "revert-25285859-anon_bt_address_sc_qpr1_dev-BPSMRIRDYG" into sc-qpr1-dev am: 544f1fb3 -s ours am: e2c0ae01 -s ours am: 27ef5d58 -s ours am: 4373683b -s ours am: 0f31b0d3 -s ours am: 0ff5e240 -s ours am: f822045d -s ours
  [automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 24af9bf0 -s ours am: fefc0e14 -s ours am: dfc1145a -s ours am: 085541f0 -s ours am: 3890b87a -s ours am: cedd1356 -s ours am: e47a1dfe -s ours