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