[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 7ac46d6356 -s ours

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

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

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