[automerger skipped] Merge "Merge redfin/bramble support." am: b0c41a1b -s...

[automerger skipped] Merge "Merge redfin/bramble support." am: b0c41a1b -s ours am: 4fbdfd32 -s ours

am skip reason: Change-Id I25b60e5225247a335cdc0dcd751de47374cdcfbb with SHA-1 35a2a4c3 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466483

Change-Id: I5c87f514ba14109b8a79e12adee2115a87cb792b