[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fea0 -s ours am: fc10de5470 -s ours am: 6428c6ad87 -s ours

am skip reason: contains skip directive

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

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