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

Merge changes from topic "am-6d3327ab58c342808ec50051f106b450" into tm-d1-dev-plus-aosp am: 56794040

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



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