Merge "servicemanager: log for service collision" am: af93203d4f am: 84e419d5e1 am: ea8c8388ca

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

Change-Id: Ia12a6b7de144ecae4a3cd5c8a2191dae488bd63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>