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

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

Change-Id: I50f6546f2b829c38d359d0385155b9a411545964