Merge changes from topic "am-011deab34d514b939715ba9a508e18d9" into...

Merge changes from topic "am-011deab34d514b939715ba9a508e18d9" into tm-qpr-dev-plus-aosp am: 9bc94af6 -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: Iedd3e0ac739c77dac44be234945b1dd948593ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>