[automerger skipped] Merge "Merge redfin/bramble support." am: d4e1aeac69 -s ours am: f4318b3ccb -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: Ifb2c5690fc821af204ae0d50e05489a6e37cde63