Merge "init: clean up DelayService()" into main am: fdbf5a5eac

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

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