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

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

Change-Id: I3eb4157b41d58f0877e9469d49b1bde86aeb2bc8