[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am:...

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: c5d5a9e7 -s ours am: 22e87752 -s ours

am skip reason: Merged-In I4a45d361732bc7f21be3d9db108f52f664e5c949 with SHA-1 3dd7f37c is already in history

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



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