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

Change-Id: Iac2fd2e50142927262e60bc4b0ee736359581aaa