Merge "servicemanager: restart more services on crash" am: 021f5e9d9d am: 8107fd2da8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1312355

Change-Id: I10c1ff5b8e37dfcb480399ace138aff3e949cf42