Merge "init: Wait for daemon to fully spin up all threads" am: 545870e53a am: 3aabed9e77

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

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