Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8 am: d03e2cd28d am: dfc3beda06 am: 16cf063cc9 am: 39d0e2cebc am: 69e5913fdd

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

Change-Id: I7a59f59176ba2370d91aae2764db7a7c3ae54abc