[automerger skipped] Merge "Copy removed.txt file to the snapshot correctly"...

[automerger skipped] Merge "Copy removed.txt file to the snapshot correctly" into rvc-dev am: a1096824 -s ours am: 2350cc75 -s ours am: 00237021 -s ours

am skip reason: Change-Id Iad34e91051da43222d22c240c16f50887c43d73e with SHA-1 3dbf9fd8 is in history

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

Change-Id: I1229b360f45e4ec5eb5780c6fe445abdec5442a8