[automerger skipped] Merge "Merge redfin/bramble support." am: 1324688f1a -s ours am: 34ee9020eb -s ours am: 10720ce356 -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: I6c191dcac5b2cd13b3af5e3e2efc2d48108b7069
This commit is contained in: