Merge "Refactors in advance of crypto-secure boot level" am: 5975c89776

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1660530

Change-Id: I62dfa8d9e77c1ca7fe4eb1d1474ccd92a9fc7f91