[automerger skipped] Refactor the SADeviceState to AdiDeviceState am: 41f08b8d70 am: c84fa21c39 -s ours

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

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

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