Merge "wifi: Prevent returning an invalid factory MAC address" am: 6119f16921 am: 3e6084c05d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1496341

Change-Id: If67f489d54f6ce3f4c905b5bc3497adc6b986ccb