[automerger skipped] Merge "Merge "wifi: correct API name" into rvc-dev am: 14ebab3b19 am: 2107484d95" into rvc-d1-dev-plus-aosp am: 658f57d1cc -s ours
am skip reason: Change-Id I3bcbcfd04dced36b63436b5a96835fb0d8f35f3b with SHA-1 7a0c18c884 is in history

Change-Id: I075404d9febadb210dbe9775440acbad279c28d1