[automerger skipped] Merge "Adding vendor_boot-test-harness.img" into sc-dev am: e135511f4d
am: dbab3c817a
am: 00cca5b11a
-s ours
am skip reason: Merged-In If3a1393b4ff3e69bb9b62f3b843b7858437d47bf with SHA-1 3e35c26bf2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15454001
Change-Id: Ie9654846858284603c36768dcaac0aa2894f13f6
This commit is contained in: