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: Iaac293d78bc32093250e5fb3287ab6a355d13950