[automerger skipped] Merge SP2A.220505.002 am: bed51403 -s ours am: 1967ebff -s ours

am skip reason: Merged-In I0757557e66725dddfd871cd9857071a8749bd7ba with SHA-1 410ce026 is already in history

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



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