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

Change-Id: I9bc1a51e0760ff826350bedf79940f86a3e7c78d