[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into...

[automerger skipped] Merge "Refactor the SADeviceState to AdiDeviceState" into udc-qpr-dev am: 82879081 am: 325db5aa -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 b024dffb is already in history

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



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