Merge "init: Add more diagnostics for signalfd hangs." am: fe62ca7165 am: 885dcf9661

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

Change-Id: Ia2103a2ebb6bac3cfdd7aca28d288303b7e2d03b