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

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

Change-Id: Ic030d404dd295970fc5616f0e71e44c27cd9e555
tree: 070ae20d1f10c781760fb725c648c451d8673c53
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/