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

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

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