Merge "Revert "init: Add more diagnostics for signalfd hangs."" am: fa4926a9de am: ee599c860d am: 5616977daf

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

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