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

[automerger skipped] RESTRICT AUTOMERGE - Revert "Refactor the SADeviceState to AdiDeviceState" am: 5c1a88fe -s ours am: fc10de54 -s ours am: 6428c6ad -s ours am: e17de20f -s ours

am skip reason: contains skip directive

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



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