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

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into udc-dev-plus-aosp am: 4d5d5169 -s ours am: 7a98042c -s ours

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

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



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