[automerger skipped] Support for non-factory attestation in Strongbox. am: 0e0f60cf am: 57ac5ffd -s ours am: 5a5b8734 -s ours am: 0466c865 -s ours

am skip reason: Merged-In I8fe176a18fc0b9e2b2d0b012b7b63124d15c9e2f with SHA-1 50fcf7d0 is already in history

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



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