Merge "Fix reading property from persisted AdiDeviceState" into udc-qpr-dev am: 25854b70

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



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