[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: c5d5a9e7 -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: Id7f8988f4a20f73774447fd29b9107bfc0c2959d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>