[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 4de1b2000d -s ours

am skip reason: Merged-In I97a97fea0952227a9663e7001c9f031fb3cc725e with SHA-1 24af9bf053 is already in history

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

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