Merge "wifi: Use new API for wifi data usage function" am: 7469890c87 am: f38761e027

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759

Change-Id: I40404277f44a14d60654911e168a482794355971