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

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: f2d0aa95 -s ours am: 318ff04f -s ours am: 22dc888c -s ours

am skip reason: contains skip directive

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



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