Merge "servicemanager: log for service collision" am: af93203d am: 84e419d5

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



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