Merge "Add null check for NPE before logging" into rvc-dev am: 5fe7d558be

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

Change-Id: Icf67c60daf3e233fe419546368fa855ec4ed1ac0