Merge "Cope with rkp-only devices in legacy keyblob test" into main am: 5c5a412b3c am: f75d6a73db

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3036973

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