Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8 am: dca63bd29f am: 2e32e57b83 am: 00d05b7930

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

Change-Id: Id2ae43554ade4a6117441532ff0d0683286eae34