Merge "Handle bad rename" into main am: faa7c7c1 am: 2aa5b5de am:...

Merge "Handle bad rename" into main am: faa7c7c1 am: 2aa5b5de am: 93a21240 am: 46f9650c am: 094228c3

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



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