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

Change-Id: If40d91359a2f941475b119ba2569963b5155734d