[automerger skipped] Merge "Rebuild and copy recovery patch files when using...

[automerger skipped] Merge "Rebuild and copy recovery patch files when using vendor_otatools" into tm-dev am: 8cfbeb4e -s ours

am skip reason: Merged-In I4a415417e0d7b1bcd548292ec8f3a12570ec65f0 with SHA-1 246a5c06 is already in history

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

Change-Id: Ifa6871a5cf603ed07bee0a79b52012cc4844bad7