Merge "Fix test assumption for KeyMint+RKP integration" am: 466f3c55a9 am: e99fbf5d61 am: ba6833daea

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

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