[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 41f08b8d70 am: 43b047027f -s ours am: c78dda6686 -s ours am: 8a10e15786 -s ours

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

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

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