Merge "Make timeout messages distinct" into main am: 1b251d44

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



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