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

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

Change-Id: I9010114741caba18de830cfeb8898989be61e04f