Merge "Protect against NPE" into rvc-dev am: 7f572a5a76

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

Change-Id: I6ce81805c5efe1f68048bc4d766aa1cce8b5a2ac