[automerger skipped] Merge "Skip ATTEST_KEY using variant on waivered devices"...

[automerger skipped] Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61a am: 8cae7cb4 -s ours am: 766d0cd7 -s ours am: a8043194 -s ours

am skip reason: Merged-In Id448edae88569518deb2db4ab7bf50d16f33709a with SHA-1 c3de1caf is already in history

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



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