[automerger skipped] Merge "init: Add option to listen on sockets before starting service." into tm-qpr-dev am: 0024d682 -s ours am: 553260d9 -s ours

am skip reason: Merged-In I91b3b2b1fd38cc3d96e19e92b76c8e95788191d5 with SHA-1 ecc14a59 is already in history

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



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