[automerger skipped] Merge "Merge SP1A.211205.008" am: 25793b59 am:...

[automerger skipped] Merge "Merge SP1A.211205.008" am: 25793b59 am: 41cdd9ce -s ours am: f0c53adf -s ours

am skip reason: Merged-In I292d7f27b253f71066194e3f60bd7114e579c87c with SHA-1 4380a6ef is already in history

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

Change-Id: I44f99278cdc8f56412e0742324e86eb65bfe25d8