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

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

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