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

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

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

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