Merge changes from topic "presubmit-am-329e4fc8da1d4d5ab89d9125d36ec5ea" into...

Merge changes from topic "presubmit-am-329e4fc8da1d4d5ab89d9125d36ec5ea" into tm-mainline-prod am: ae35a780

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17418078



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