Merge "health: Add AIDL VTS to general-tests." am: c8b8ec2983 am: 2ceacdd912

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

Change-Id: I5aac37a0a0dc2c7be5923f444e7a23c9a61adfcf