[automerger skipped] Merge "Fix attestation properties reading logic" into...

[automerger skipped] Merge "Fix attestation properties reading logic" into udc-qpr-dev am: 0b49f269 -s ours am: c754bea8 -s ours

am skip reason: Merged-In I9af7daa08cbd8bb52f3509fe93f787ba94b7bbc3 with SHA-1 316e3d16 is already in history

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



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