[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 24af9bf053 -s ours am: fefc0e14dc -s ours am: dfc1145ac4 -s ours am: 903a86b9cc -s ours am: c4c056f235 -s ours

am skip reason: contains skip directive

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

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