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

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

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