[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7475d225 -s ours am: c9f6516d -s ours

am skip reason: Merged-In I76c7f54cc9a1cb63b7a1739f113f3386e008df01 with SHA-1 cf356d24 is already in history

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



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