Merge "[automerger skipped] Merge "Refactor the SADeviceState to...

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

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 46daed07 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>