Merge "Fix VTS test for health HAL 2.1" am: 0935243c44

Change-Id: Ibb4705efef6c6faa472dbd4fcd580d2185cdc1fa