[automerger skipped] Merge "Fix small mistakes in dumped string" into main am:...

[automerger skipped] Merge "Fix small mistakes in dumped string" into main am: 05a24e80 am: 474c60bf -s ours

am skip reason: Merged-In I17017c9da0a55fb860a9ad9d4a547b1c818b7fac with SHA-1 64242314 is already in history

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



Change-Id: Id53dd80c0f6b4f5028a748eec60844262a19a2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>