Merge "Refactor the SADeviceState to AdiDeviceState" into main am: c71ac05ce0

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

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