Merge "servicemanager: restart more services on crash" am: 021f5e9d9d am: 8107fd2da8 am: 4a83ba8f08 am: 971c242f94

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

Change-Id: Ia5265b6f53e207812bd984583202da69b0c024dd