Merge "Convert usb hal test to use VtsHalHidlTargetTestEnvBase" am: a5123bb1b8
am: ef151c3693

Change-Id: I03b2e68f98bc0747c71805a33cccafb668602af9