Support for non-factory attestation in Strongbox. am: 0e0f60cff1

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

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