[automerger skipped] Merge "Merge redfin/bramble support." am: 1324688f1a -s ours am: 34ee9020eb -s ours

am skip reason: Change-Id I77cffc12306fafa5fdd79a426937f5ba232394a3 with SHA-1 eb3d6ab2ac is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1465807

Change-Id: Ib5649ccc9acb8f27a2b6eb1cc427c3894d07663c
tree: 792ebf5fc6b482e79bfaca0747e24a9e1a6cd84c
  1. tests/