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

Merge "init: make reboot_on_failure not apply to manually stopped services" am: 890fd0c2 am: 7a07e8c1 am: 506762b3 am: 6ba6672c

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

Change-Id: I75d804241126cf0aa76f7fd61351a73949db87cb