[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: f4378487 am: d9592852 am: b9c68bbf -s ours am: 684ee29d -s ours am: ec983ee9 -s ours

am skip reason: Merged-In I047bc7dfe6a217c1a88faf3ed5c6783f33227c32 with SHA-1 7cee1c4f is already in history

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

Change-Id: I990eefbb8078704f2bcdfaa515f10a45b863f30d