[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f -s ours am: bda0c674 -s ours

am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76 is in history

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

Change-Id: Ie60eb5b5524b59ab0f8b2aa4079c08a685b02577