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

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

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