[automerger skipped] DO NOT MERGE - Merge Android 13 am: d8acf986 -s ours

am skip reason: Merged-In Ia5894e6ac060975b6e1bd9b78e839e05361e3687 with SHA-1 8781f501 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2186846



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