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

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

Change-Id: I328f2a7bd1a8629efb3857b69e31e45e53eca0e8