Merge "Fix VTS test for health HAL 2.1" am: 0935243c44 am: 65a070de36 am: 3458203ca7

Change-Id: Iea04d74cdbbc63bd80fc3b6bcd2692ef5150300d