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

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

Change-Id: Id211edffc61e2371cd619e71b4952495c422e5c3