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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1916599

Change-Id: I75d8b4b78d54a6238e4c4195a8cb03133b163888