Merge changes from topic "am-d856fda0a19c4bd681e3715298598d14" into tm-d1-dev-plus-aosp am: 67ad09e1 am: 40797d5a

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



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