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

Merge "servicemanager: Overwrite old service when a new one is registered" am: 9790d930 am: 9fb40a4f am: e90f7bb1

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

Change-Id: I22c63ea2a1486bad53977130f8a8313f1d3fb80f