Merge "Make wifi module use shared metalava args" am: 99c83943aa

Change-Id: I6d52ebc20826807907739bc581b8b23e4de42d84