[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 am: 3e20b3b7 -s ours am: b09aee96 -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: I435e609767f999d19aa902ced344ae9faf14c320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>