Merge "wifi: Don't include legacy hal header in wifi_status_util" am: 786c00d72e
am: 398f8c2439

Change-Id: I635af1ee8af4a8affca714c1ddb1d5275ffc19f4