Merge "servicemanager: explicit addService errors" am: 1644473e9a am: c5340c1600

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

Change-Id: Id3b88e6866d1375345fccd39ac772027ff0ef427