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

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



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