Merge changes from topic "am-4747c0cec8794ee29743ec0284ab899f" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05ce0 -s ours am: d4375dba99 -s ours
  [automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 5e0fb3e445 -s ours am: 43552e9ebd -s ours