Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into...

Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp am: 821dc7e5

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



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