Merge "Skip device id attestation tests on devices receiving only system update and not vendor update, on such devices `android.software.device_id_attestation` feature may not be configured correctly." into main am: ac0588e25e am: 4ec2fb9b52

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

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