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

[automerger skipped] Merge "Merge redfin/bramble support." am: fe3c19fc -s ours am: 0eb5f6c9 -s ours am: 2dbcb988 -s ours am: 4aa39878 -s ours

am skip reason: Change-Id I71634cd2737915d4760dc6a4bc1decc1ea37023a with SHA-1 0b0cc0d5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1466403

Change-Id: I396825bfa58a764bb633eba2a78862a3456aa74e