[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState...

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 4de1b200 -s ours am: 6bc913f9 -s ours am: 30519896 -s ours am: cc47e0e2 -s ours am: c30fd935 -s ours am: 2d5dc0a4 -s ours

am skip reason: contains skip directive

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



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