Merge "servicemanager: log for service collision" am: af93203d4f

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

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