[automerger skipped] Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61afb am: 8cae7cb490 am: 3e20b3b749 am: 42c050de92 -s ours

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

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

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