[automerger skipped] Refactor the SADeviceState to AdiDeviceState am:...

[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 41f08b8d am: c84fa21c -s ours am: 7f9ab55f -s ours am: fcb247e4 -s ours

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

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



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