Merge "init: make reboot_on_failure not apply to manually stopped services" am: 890fd0c239

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

Change-Id: I5a89eea733b7c7fbbb4f73a766eb01feea36e0cb