Merge "Merge "Prevent a crash when constructing NSSL." into qt-dev am:...

Merge "Merge "Prevent a crash when constructing NSSL." into qt-dev am: a9828ff5 am: bba34a3f am: 86ec69b6 am: dca63bd2 am: 2e32e57b am: 00d05b79 am: d12fb442" into sc-v2-dev-plus-aosp am: 5b8e2486

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

Change-Id: Id1ff01ef263c84c71d7fa97c1a3a9236ece3b4b5