Merge "Amend tests on GSI that rely on RKP-only props" into main am: 550caafbfd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3168999

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