[automerger skipped] Merge "wifi: Use new API for wifi data usage function" am: 7469890c87
am: f38761e027
am: eb9ec7f664
-s ours am: 956fdad9c6
-s ours am: cf4980bcc4
-s ours
am skip reason: Merged-In Ia4d8fa67ea3cb75c2d35be9ab60e5c5ffa391ffb with SHA-1 26128e8722
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1628759
Change-Id: Icf3864daa2fa256cf396ee7f9e3b8dbe6b64dcf5
This commit is contained in: