Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: d9862a4d0c

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

Change-Id: Ic030d404dd295970fc5616f0e71e44c27cd9e555