Merge "Convert configstore hal test to use VtsHalHidlTargetTestEnvBase" am: 42749f8863
am: 8857a90053

Change-Id: Ifa94c66094f72913b13d0d29647f281d53ac9fd1