Merge "Make the log format more realistic" into main am: e2f6a591c7

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

Change-Id: I2a1c75442cfb38f4212f72912b09546dfaeaa5f1
Signed-off-by: Automerger Merge Worker <[email protected]>