[automerger skipped] Tests updated to handle RKP-ONLY property on GSI builds. am: c2702bf085 -s ours

am skip reason: Merged-In I8028c20a47cf46aa807270e948e37ed6a08bfa02 with SHA-1 94f2503f13 is already in history

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

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