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

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

Change-Id: I1850c2de08e94b12dcd92c8eaab6baefee457c0e