[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 am: 0ac3af35 -s ours am: 6c6f8979 -s ours

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

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

Change-Id: Idbef16aaaf1fe3ba742ee7809bf59fc7632ef5aa