[automerger skipped] Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev
am: a73a8c9b2b  -s ours

Change-Id: Ibe587199700defc6fb254bb8400187520cb6f686