[automerger skipped] Merge "Merge "wifi: correct API name" into rvc-dev am:...

[automerger skipped] Merge "Merge "wifi: correct API name" into rvc-dev am: 14ebab3b am: 2107484d" into rvc-d1-dev-plus-aosp am: 658f57d1 -s ours am: 79153e7e -s ours
am skip reason: Change-Id I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b with SHA-1 7a0c18c8 is in history

Change-Id: I544c619c80dc3ca7e5de97e6fe2881e9079daac3