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

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 0dd3ca5e -s ours am: 89b91ffc -s ours am: ae7827c0 -s ours am: 33c46330 -s ours am: 59171ea8 -s ours

am skip reason: contains skip directive

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



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