[automerger skipped] Make VtsHalWeaverTargetTest test both HIDL and AIDL services am: 1cd59722b6 am: 96981af109 -s ours am: ac65b03f0e -s ours

am skip reason: Merged-In I6b760930146ad1b08f17ef810a86c0058601c3bf with SHA-1 b59654f239 is already in history

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

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