[automerger skipped] Merge "Remove duplicate component from sdk snapshot" am:...

[automerger skipped] Merge "Remove duplicate component from sdk snapshot" am: a8de9fb2 am: b821cd65 -s ours

am skip reason: Merged-In I515f235fe21755b5275af12366e96c24c94c0273 with SHA-1 a1aa7387 is already in history

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

Change-Id: I3b1fceb6ba7ffe90f4f7224d076099b30411aa33