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

Change-Id: I1934e5418048cbb490e8999a5ec1314301510233