[automerger skipped] Fix AIDL VTS setup am: eaf26606 am: a6dcde47 am:...

[automerger skipped] Fix AIDL VTS setup am: eaf26606 am: a6dcde47 am: 19af813e -s ours am: 33cec86d -s ours

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

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

Change-Id: Iddb603e327be6b57a09b9f12e8ab571906d579c8