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: I32ece97bfa3d342ee9c4422a906fdaf7aac92831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>