Merge "Fix Wi-Fi SSID null handling" am: cadd76044e am: 0685b82ee2 am: 6da1dc6363

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

Change-Id: Iefb2bd39b51072cda3d4239e031ab00bd2e6f5c4
tree: 8709c76073ac1a94116c0f684cc8f8fda355947e
  1. core/
  2. services/