Merge "Handle already existing targets of different name" into main am:...

Merge "Handle already existing targets of different name" into main am: 68a3d9b3 am: 07eb2124 am: c85ebf33 am: 51da5292

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759611



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