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

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



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