Merge "Tests updated to handle RKP-ONLY property on GSI builds." into main am: a32e531884

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

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