[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: c3b880bf -s ours am: 16cc9b8f -s ours

am skip reason: contains skip directive

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



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