Merge "wifi data usage: replaced Wi-Fi SSID with a Wi-Fi network key" am: 719ce67677 am: 28df48c743 am: fe44c47335 am: 15e48292e1

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

Change-Id: If983063e6a89c2bbb64927dbab5daf6df42ca0b5