[automerger skipped] Merge "servicemanager: Overwrite old service when a new...

[automerger skipped] Merge "servicemanager: Overwrite old service when a new one is registered" into rvc-qpr-dev am: b0527022 -s ours am: beb62f93 -s ours

am skip reason: Change-Id I8835d9f7505367d83a0f29f1d928a07b3d57e56a with SHA-1 05ffe52b is in history

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

Change-Id: I61c2d1f469ae1efc858663bf1ffa691b5ffbeb0c