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

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

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