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

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

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