Merge "wifi data usage: Update calling API name" am: e98b325f6d am: b4440b1868

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956050

Change-Id: Icd19698db9038bdd319222dc672215b7db27cd73