[automerger skipped] Merge changes I8752aea9,I89d1d6a1 into main am:...

[automerger skipped] Merge changes I8752aea9,I89d1d6a1 into main am: 7a6ecced am: f7cbb7d8 -s ours am: 8c0de05c -s ours am: 7590c01f -s ours am: d0bd0140 -s ours

am skip reason: Merged-In I8752aea9d1f792a5cbbbbd5d2ca7424f731c6320 with SHA-1 7b74471c is already in history

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



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