[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 24af9bf053 -s ours am: fefc0e14dc -s ours am: dfc1145ac4 -s ours am: 085541f042 -s ours am: 3890b87a2f -s ours

am skip reason: contains skip directive

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

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