Merge "Fix test assumption for KeyMint+RKP integration" am: 86d2173992 am: 555a0103ff am: 5e31b04350

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

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