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

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

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