tree 6addadfe737d32951f5edd4945d55c3fa0703e94
parent f7028a1340149ca0ccf17392cd8dc519eed63f4a
parent 57fdce865529130c2f0848255fde4e54b2d5594a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697829813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697829813 +0000

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

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07e6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2793969

Change-Id: Iee69c2be16984d6469654159a2256464e6910914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>