Merge "aidl: Improve Effect VTS naming" am: 187b6b7ece am: 68cceeb6c7

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

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