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

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

Change-Id: Ibea8a3de1421f7a673ca2582b82569c617328718