Merge "Convert vr hal test to use VtsHalHidlTargetTestEnvBase" am: f82e0825b6
am: a587d66b53

Change-Id: Ia7271ccdf80c028277e3e7bc21b1259a7f84119c