Merge "Identity: Fix breakage caused by recent changes in libsoft_attestation_cert." am: aef57a826a am: fb669b9e39 am: f05dcc4cbd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1584471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4669124e6c55ecef649ffedd8e98f0f179fe8617