Merge "Quick fix for NullPointerException 211713013" into sc-v2-dev am: b7f37cd797 am: 19516a0496

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

Change-Id: I4842f7c2e4e74a29f6b1868838dfb6d9d3b49158