Merge "Fix logging bug" into sc-dev am: 8f17b10c48

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

Change-Id: Icc911ea99b94697a87767056cf4cab0518f127cc