[automerger skipped] Revert "init: make reboot_on_failure not apply to manually stopped services" am: 1fda6f1b am: 785e4ccb -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: I9168030cd6c60606170520b3811369548c3dd6db