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

Change-Id: I2aca4f21e8d31fcc9f1cb5f9dd84c555c951990b