Merge changes from topic "presubmit-am-978f4d87dcd74b94998b115677f1bbc2" into...

Merge changes from topic "presubmit-am-978f4d87dcd74b94998b115677f1bbc2" into tm-mainline-prod am: 0c2673f6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/16981688

Change-Id: I43fd6573a0f052a4ccf7301814d84549cce1c5ae