[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 am: 2190994b -s ours am: 26b9e2f0 -s ours

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

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

Change-Id: I5d5d03070c2482ba921928d381d8e060120d40af