Merge "init: clean up DelayService()" into main am: fdbf5a5eac am: 30e996b9a4 am: 31f88e858a

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

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