Merge "Refactor collectEvent method in SensorsHidlTestBase"