Merge "KeyMint manual key upgrade tests" am: 3d40abfec8 am: 88bacf9701 am: 628c00d572

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

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