Merge "Merge "WiFi-HAL: Map kernel returned error code to wifihal error" into oc-dr1-dev am: 6feb8575 am: 599a85f7" into oc-mr1-dev-plus-aosp