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

[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 41f08b8d am: 43b04702 -s ours am: c78dda66 -s ours am: 8a10e157 -s ours am: 32229d4c -s ours am: bce99c90 -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: Ibba3b8b6104c04d588176718a36868ab8a9c2b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>