[automerger skipped] Merge "Fix print-logs" into mainline-prod am: d4ae64b9ea -s ours

am skip reason: Change-Id I2201fc0538876d1d6dfd6ab7abfac43cccc1102f with SHA-1 432f3705a9 is in history

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

Change-Id: Ib3c4bb9ed6caaac43a6dc2f72d542a2dbdcaaa76