[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 0dd3ca5ef3 -s ours am: 89b91ffcc5 -s ours am: 43ac50bdda -s ours am: db11fa5693 -s ours am: 7ff95fb78d -s ours am: a8ba383b20 -s ours

am skip reason: contains skip directive

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

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