[automerger skipped] Merge "Fix base class of WifiHidlEnvironment_1_2" into...
[automerger skipped] Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev am: a73a8c9b am: 770b25ab
am: fa79f2f8 -s ours
Change-Id: I3a38ecb8e42fba70a87c4ff9b00e8446d139d259