Merge "Fix base class of WifiHidlEnvironment_1_2" into pi-dev
am: 5a45bbf821

Change-Id: Icb46f94a377328df86dd8317411ae85ab7949000