[automerger skipped] Fixed unreadble debug messages am: c42d38c3 am:...

[automerger skipped] Fixed unreadble debug messages am: c42d38c3 am: 8d699af3 -s ours am: 492b187e -s ours am: b186145f -s ours am: 6a7907ee -s ours

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

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

Change-Id: I2dc4e75e08047f307df3b19c13b47016948309ab