[automerger skipped] Merge redfin/bramble support. am: 6f2366f105 -s ours

am skip reason: Change-Id I31bc3848255babd08cfc62384565fa685004117d with SHA-1 f09586ee85 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Settings/+/1465938

Change-Id: I4963f86129886143b33a2f7a771bd6790f25ec31
tree: d6c1d6245c2b21d1206fe3c786466f9a16566975
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg