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

Merge changes from topic "am-6b6766895f7d47fcad089b02790bcf29" into tm-d1-dev-plus-aosp am: cf52285a am: ce727c0b

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



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