Merge "Fixed unreadble debug messages" into rvc-dev am: 9ff2625493

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

Change-Id: I7d153d6fecc4f188ca46672c2117d7e3cb26e299