Merge changes from topic "presubmit-am-96ab6a913e2f4bc58a9e977bd28c7d31" into...

Merge changes from topic "presubmit-am-96ab6a913e2f4bc58a9e977bd28c7d31" into tm-mainline-prod am: 6570d36a

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



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