[automerger skipped] Format VTS test code am: 21cc1371a9 -s ours am: fda5fdbe61 -s ours

am skip reason: Merged-In Iecc0c9388c6596cf5a25918f8f0af0495b2133a6 with SHA-1 9e60e635bf is already in history

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

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