Merge "KeyMint VTS: better early boot key tests" am: f3374d4237

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

Change-Id: I26a928e5603c91b8737c1ff797cd0dd2a890a890