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

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

Change-Id: Ic2a674060a35c7414aa8af06f99db58caa2574c1