[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638 am:...

[automerger skipped] Merge "Add android-cts-verifier.zip" am: a1b1f638 am: 34f50fef -s ours am: d59357cb -s ours am: 47004887 -s ours

am skip reason: Merged-In I63b2da75391221119025b597257c26906718cf77 with SHA-1 2bbe1fe2 is already in history

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

Change-Id: I71d971a2ad448b1a6a24a5be4f29823c129424f9