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

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

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