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

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

Change-Id: Iefb2bd39b51072cda3d4239e031ab00bd2e6f5c4