Merge "Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff519 am: bba34a3fcf am: 86ec69b6a8 am: dca63bd29f am: 2e32e57b83 am: 00d05b7930 am: d12fb44242" into sc-v2-dev-plus-aosp am: 5b8e2486bf

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

Change-Id: Id1ff01ef263c84c71d7fa97c1a3a9236ece3b4b5