Merge "wifi: Remove deprecated aidl methods"