[automerger skipped] Merge "wifi data usage: Update calling API name" am:...

[automerger skipped] Merge "wifi data usage: Update calling API name" am: e98b325f am: b4440b18 am: 827604bd am: a81afedb -s ours

am skip reason: Merged-In I02d7f57de1acfd7b03be0a3e1c957ec1e1c5b4d4 with SHA-1 52aefa26 is already in history

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

Change-Id: I3d87f03c951a8ad613a2e73cb647f163fb90ebd5