Merge "Revert "init: Add diagnostics for snapuserd hangs"" am: d3f267200e

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

Change-Id: I7d82e1164a0276f36d070d9c9bab9d4d68e9809f