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

Change-Id: I40c82222ddb2798ab35d136e96fd2e5aa9827746