[automerger skipped] Fix AIDL VTS setup am: eaf2660625 am: a6dcde47d3 am: 19af813e7d -s ours

am skip reason: Merged-In Ice60f7fae313863e97e425994bee5ad1d703c807 with SHA-1 5da33a22ac is already in history

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

Change-Id: I032e874da735f435d6a7a0b7546a46ebb5836c8f