Merge "wifi: Extend onFailure callback for dual AP case"