[automerger skipped] Merge "Disable cb if configured by OEM" am: 47540b57...

[automerger skipped] Merge "Disable cb if configured by OEM" am: 47540b57 am: f2103740 am: ee13dcf7 -s ours am: c09c5267 -s ours

am skip reason: skip tag Change-Id I91c7b48d94070c0cf197b17c4493f5e4112b6b2e with SHA-1 85762e91 is already in history

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

Change-Id: I8f5d42e137596582426321f4afbf657f5451f404