Merge "Fix Wi-Fi SSID null handling" am: cadd76044e

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

Change-Id: I92537bac7a2762a74a1df051efa1600fdf381eeb
tree: f36f1cd0ad2fd0c623bd1f527b222049ac704d07
  1. core/
  2. services/