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

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

Change-Id: I6f8358c26509701db1f276f409a6b7857d4111a6