[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 5099cd8c -s ours

am skip reason: Merged-In I11850bf221a36e4e3846b148020807a250db4126 with SHA-1 e0797980 is already in history

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



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