[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 5e0fb3e445 -s ours am: 43552e9ebd -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: I6f84cd14729f271e6d442d8b38fa182764fbbf23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>