Merge "Fix attestation properties reading logic" into main am: b68714bf am:...

Merge "Fix attestation properties reading logic" into main am: b68714bf am: 6d0e0cb1 am: 7bbc4201 am: 0b14d9d4

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



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