Merge changes from topic "am-7692172354ef491dbc6bc38caaa00c05" into...

Merge changes from topic "am-7692172354ef491dbc6bc38caaa00c05" into tm-d1-dev-plus-aosp am: 8135aa45 -s ours

am skip reason: Merged-In Ibc3814dabd59cf9f0f9505b88f2146a4c3c5e015 with SHA-1 deec8016 is already in history

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



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