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

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

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