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