Merge "wifi: Add scanning mac oui setter" am: fc5a779766
am: 2666dcea2e

Change-Id: I3d4194b7142d0ec6088dbd2a012f465811d32743