Merge changes from topic "presubmit-am-46d6a9a3974347168d8d6d8d3155099d" into...

Merge changes from topic "presubmit-am-46d6a9a3974347168d8d6d8d3155099d" into tm-mainline-prod am: de41a9ed

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



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