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

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

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