[automerger skipped] Merge "Adding vendor_boot-test-harness.img" into sc-dev...

[automerger skipped] Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f -s ours am: ee7bd5f2 -s ours

am skip reason: Merged-In If3a1393b4ff3e69bb9b62f3b843b7858437d47bf with SHA-1 87f60017 is already in history

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

Change-Id: Icd75c1aa77e9b5618970edb42eee182889832102