[automerger skipped] Merge "wifi: correct API name" into rvc-dev am: 14ebab3b19 am: 2107484d95 am: d65fb86805 am: 4f7e697403 -s ours
am skip reason: Change-Id I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b with SHA-1 dd8f942e81 is in history

Change-Id: I05845a00793ab48b10788a9eb65ff071d035ec6d