[automerger skipped] Fix AIDL VTS setup am: eaf2660625 am: a6dcde47d3 am: 19af813e7d -s ours am: 33cec86d14 -s ours am: 892dd88fb6 -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: Iacc61d206dc684cf65fe4cf6914d256cb3df8002