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

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

Change-Id: I9e3bc289ac8c3da842e03acd6b7a205371375ab5