[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e75 -s ours am: b84ce06c22 -s ours am: a13fd40ede -s ours

am skip reason: Merged-In I86c2de977de052bfe9dcdc002dcbd9026601d0f3 with SHA-1 65f3d09445 is already in history

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

Change-Id: Iffd5e2dc02107a7315175c3add318f1f0172ce32