Merge "init: non-crashing service can restart immediately" am: acfc93f924

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

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