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

Change-Id: I18081c95710d4d505991628994df7a9ebbdc99df