[automerger skipped] Merge "wifi: correct API name" into rvc-dev am: 14ebab3b19 am: 8ef9b979aa am: f70ea0aaf0 -s ours am: 589e9f022c -s ours
am skip reason: Change-Id I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b with SHA-1 7a0c18c884 is in history

Change-Id: Ie5ed2caa7e40d08ec5d93ad70ee7855f62500a09