Merge "logcat: fix tests broken from new formatting" am: 6233b23918

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1417788

Change-Id: I0bf786f464867879353f8fe92803bbd385df6062