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

Change-Id: I836a4beefc5117cb4c8c019ce00e56a02665a41b