[automerger skipped] Merge "Merge redfin/bramble support." am: dc03000e92 -s ours am: f702deaaf2 -s ours

am skip reason: Change-Id I674d1774ce50ac71a37fcc0eb418d310fe01a289 with SHA-1 5052c70dd8 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1466442

Change-Id: I9b76308dd1403e26edf06f9de6c52683ea59fee6