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

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

Change-Id: I3a54b30f4ddfcd31107011f7065cfb7fbdbf97d5