Merge "Fix error where otacerts in VENDOR_BOOT isn't replaced" am: 3c1a6ee5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bfd53d68d1a0e05134c7cf38564b535bb10118c