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

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05c am: 9f99ab70 -s ours am: 851a0d5a -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: Ibccbe62d698f1b19a94a2dd0efd6fed4e3eac5a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>