Merge "Delete legacy "wifi interface name guessing" behaviour am: 9e22554068 am: 998e766acc" into oc-dr1-dev-plus-aosp
am: 8b2422176e

Change-Id: Ie9b15850e3d0a332fe6f4192b3fdaabe2dea2722