Merge "[hardware][interfaces][wifi] fix -Wreorder-init-list"
am: d1785cb7f6

Change-Id: I43a36565bd9eb428e16384f5639328ac895ac71a