Merge "[automerger skipped] init: Wait for snapuserd before starting second...

Merge "[automerger skipped] init: Wait for snapuserd before starting second stage am: 36a78b8e -s ours" am: ddaa1b38 -s ours am: 2644361b -s ours

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

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



Change-Id: Ie9f14d0b15eafb0f1e18e0dff4ff754038fcc681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>