Merge "Fix usage to health HIDL HAL." am: 0ae6700b6b

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1915758

Change-Id: I7c8b347b2e26906fc69b9bbf560ca474ceeba2c8