[automerger skipped] Merge "Merge redfin/bramble support." am: 51b8fef7ac -s ours

am skip reason: Change-Id I8e64fabc3136c78958c0898d312bb384ef9a36e7 with SHA-1 61e58a32b2 is in history

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

Change-Id: I15ea992c53f36ef55d352832ea11598969129308