Merge "Merge "wifi: correct API name" into rvc-dev am: 14ebab3b am: 2107484d" into rvc-d1-dev-plus-aosp