[automerger skipped] Merge "Merge redfin/bramble support." am: 06316ed7de -s ours am: d697ca0a86 -s ours am: d35ac0900a -s ours am: 5f9f0174e4 -s ours

am skip reason: Change-Id I948358ee4ea59ad27abb41fa46fffadc75bd88fa with SHA-1 307c228446 is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1466367

Change-Id: I36ee3fbfb3c86367f77284b980a58730d2752e6b