Merge "Fix base class of WifiHidlEnvironment_1_2" into pie-vts-dev am: a73a8c9b2b
am: 770b25abd0

Change-Id: I6233ef4b07e0a3d3ea76cd84a1c79e12f0a6d5e5