[automerger skipped] In supplicant VTS test setup, make sure that the am: c33f1282d8 am: 3a68e265cd am: c371b2a5fc -s ours am: aacf2089bf -s ours

am skip reason: Merged-In I413c3803a6607a72cc3aa8a5fa208551be1b1032 with SHA-1 c33f1282d8 is already in history

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

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