Merge "Fix possible NPE" into sc-v2-dev am: d76f9c199c am: 04b46aed49

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

Change-Id: I28c9bf16b1754aabd5c0ee423a610d44d8923863