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

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



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