Merge "Revert "init: Add diagnostics for snapuserd hangs"" am: d3f267200e am: 0ad04b07bc am: 255fac42b3

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

Change-Id: Ic5fdc02d41f930e0b383aaae63f85698c048ac5e