[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: f437848713 am: d9592852bc am: b9c68bbf38 -s ours

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

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

Change-Id: I5e340962372b9117d3a0cec79b3bb52d10ff8911