Merge "Cope with rkp-only devices in legacy keyblob test" into main