Merge "servicemanager: explicit addService errors" am: 1644473e9a am: c5340c1600 am: cda09f4e0f am: 68e7ce987a

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

Change-Id: I8c2f0d82fd5fdb85d6f76b0ca30565eaf1e6dfa8