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

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

Change-Id: I2814959563c2ea2f6cd9a4561e9504d1570c90ca