Merge "Fix NullPointerException thrown by logging" into rvc-qpr-dev am: d0efb94bb0

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

Change-Id: I5ec86e389bfe34498a298c926b5e74236a632062