Merge cherrypicks of ['googleplex-android-review.googlesource.com/35620473'] into security-aosp-24Q3-release. am: 7d01737f80

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

Change-Id: I2e41b1a7c5dc756a433e78e925e3ee630e7dcecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>