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

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

Change-Id: Ib7fe9d408b39044b52ecd2e8b486a1b847080a44