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

Merge "init: non-crashing service can restart immediately" am: acfc93f9 am: 01ff0432 am: dbc4d6f7

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



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