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

am skip reason: Change-Id I22ab31327bc133f048ac0c8fd3a1cff217c04bf2 with SHA-1 7e2b51b8 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1465933

Change-Id: Ife0a7721aa434591ba6ab8c693b5c1c7b99e9037