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

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

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