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