Merge "wifi: remove @Deprecated APIs"