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: Ia1daebb5400fc5782db9c3c1f73ef8a638dec9a8