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

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

Change-Id: I9dacf92104c544f9ed12dc6fa60e4895ab228cbd