init: non-crashing service can restart immediately am: 555d2393b6 am: 43c7292e3c

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

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