Merge "Convert light hal test to use VtsHalHidlTargetTestEnvBase" am: c4c77e570e
am: 923bbc8934

Change-Id: I668bdb7e17b2107bd35eed5920759c3114a28e47