Merge "Refactor the SADeviceState to AdiDeviceState" into udc-dev-plus-aosp