Merge "servicemanager: Overwrite old service when a new one is registered" am: 9790d930d5

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

Change-Id: I83b937b82dcfcffcb88f331334b7039f059c62aa