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

Change-Id: Iba8a1cd7cd2885e3771ca68491bfc6a644262416