Merge "wifi: ScanResult: add carrier network indicator" into oc-mr1-dev