Merge "init: clean up DelayService()" into main am: fdbf5a5e am: 30e996b9...

Merge "init: clean up DelayService()" into main am: fdbf5a5e am: 30e996b9 am: 31f88e85 am: 4ff5fd38 am: e8b1a33e

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



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