Merge "wifi: Update API java to match new design" into rvc-dev