Merge "Enabled attest-id tests to run on GSI builds as well." into main am: 03b140d2fb am: 07d682714b am: b0a7128cf4

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

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