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

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

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