[automerger skipped] Merge "Remove CBS slice" am: 05ae6609 am: e5f2da31...

[automerger skipped] Merge "Remove CBS slice" am: 05ae6609 am: e5f2da31 am: 41efd706 -s ours am: 330a666c -s ours

am skip reason: Merged-In I54f3f2184c82ae073fbbdf2bb0bb6333b810f3b3 with SHA-1 94aae864 is already in history

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

Change-Id: Idbb6cdcb0ca180da8f8ebe8b8261656264e21bbc