Merge "Support for non-factory attestation in Strongbox." am: c4f05e81 am:...

Merge "Support for non-factory attestation in Strongbox." am: c4f05e81 am: 41f750ff am: 0ca0cd5c am: 929c88fd am: 9c707486 am: 3fbeb44c

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



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