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

Change-Id: Icfbfe32b53b861425a93ba66dc88bfba076cebcc