[automerger skipped] Fix validate_target_files for target files modified by...

[automerger skipped] Fix validate_target_files for target files modified by am: 4b7153b3 -s ours am: 3b7f1c5d -s ours

am skip reason: Change-Id I5769ee2ab5230d2a3a7cef10706dcc5788e654f8 with SHA-1 5d2b56b1 is in history

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

Change-Id: Ia61b165b3b3020114aa28d600681fab6c5fb761b