[automerger skipped] Merge redfin/bramble support. am: 572b8aba6c -s ours

am skip reason: Change-Id I560f047d33c985b0e072a35a32bfa35ae4cd15d9 with SHA-1 e2cd89bf3a is in history

Original change: https://android-review.googlesource.com/c/device/generic/car/+/1466443

Change-Id: I1463c7e46c20dd75f7d473c1f3a3ec8f0a617faa