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

Merge "Merge "Add null check for NPE before logging" into rvc-dev am: 5fe7d558 am: bcf30c63" into rvc-d1-dev-plus-aosp am: 8a00e334

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

Change-Id: I8585a257fef5f9b38bee05ace325f087ff65bace