[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f -s ours am: bda0c67436 -s ours am: 9d867703c5 -s ours
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940
Change-Id: I3886e4ba36d6361c60f65e28cde49fc7dd83cd1f
This commit is contained in: