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

[automerger skipped] Merge "Merge redfin/bramble support." am: 2deeebcd -s ours am: ccc2f9fa -s ours

am skip reason: Change-Id I22b952d0944fc1d1be7f6222add1a0b6108682d7 with SHA-1 66e1d22c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1466204

Change-Id: Icc81c38d03673ff8ab082afdecc2842f6ce7f8cd