Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into...

Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp am: 9668f4d9

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



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