Merge "health: fix vts test failed in aidl v2" am: 0008532f8b am: 22ec20e187

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

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