Merge "init: Add option to listen on sockets before starting service." am:...

Merge "init: Add option to listen on sockets before starting service." am: 39fee4c4 am: fbf5cb06

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



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