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

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

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

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



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