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

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

Change-Id: Id0563dc23288487c9fd4c3160afe7372cf2d9af9