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

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

Change-Id: I2921a091ecd81373f0f0a342000f8a0c5f0e7102