[automerger skipped] Revert "init: make reboot_on_failure not apply to...

[automerger skipped] Revert "init: make reboot_on_failure not apply to manually stopped services" am: 1fda6f1b -s ours am: d80e3737 -s ours

am skip reason: Merged-In I90eddf2a87397449b241e5acaaa8d4a4241d73a9 with SHA-1 d14a178d is already in history

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

Change-Id: Iea7a16260b60c61e7e586480dca720c731c97422