Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev