[automerger skipped] Fixed unreadble debug messages am: c42d38c3ea am: 8d699af314 -s ours am: 492b187e27 -s ours

am skip reason: Change-Id I8aa45474521e4ef5e2368ab25c6c39445e9f779c with SHA-1 e7580a7238 is in history

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

Change-Id: I2462fff81d1fefc0be107936f18bf740c0231729