Make VtsHalWeaverTargetTest test both HIDL and AIDL services am: 1cd59722b6

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

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