Merge "Revert "init: make reboot_on_failure not apply to manually stopped...

Merge "Revert "init: make reboot_on_failure not apply to manually stopped services"" am: e080240b am: cbf5029a am: 3b1101e8

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

Change-Id: If8842d8c0f445276bb960a415385051a98ef856f