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

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



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