Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8

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

Change-Id: I71d3a04636d462b57787576d4d8b6e428f625fb9