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

am skip reason: Change-Id Id98937603168f422d71acc1006f66b8570a0e0c1 with SHA-1 af2d2d4b17 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1466030

Change-Id: I69132472587d6b48c1b81ad57495144744b7b982