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

[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 61b2a921 am: afb3110a -s ours

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

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



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