Merge "Fix attestation properties reading logic" into main am: b68714bf1e

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

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