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

[automerger skipped] Merge SP2A.220505.002 am: bed51403 -s ours am: 1967ebff -s ours am: 4c586cc1 -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: I37e3e3acb46a1120bba1d3a023b17b1fd05e16e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>