Merge "[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05ce0 am: 9f99ab70fa -s ours" into udc-qpr-dev-plus-aosp