Merge "Remove duplicate component from sdk snapshot" am: a8de9fb2ae

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

Change-Id: Ifec24716d0ac230e1042e1e01c7907ed6231c585