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

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fe -s ours am: 4439d891 -s ours am: 520d9dfa -s ours am: a23e3a9b -s ours

am skip reason: contains skip directive

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



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