Merge "Skip ATTEST_KEY using variant on waivered devices" into stage-aosp-udc-ts-dev am: bc88f61afb am: 8cae7cb490 am: 3e20b3b749

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

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