Merge changes from topic...

Merge changes from topic "presubmit-am-d1c7662b9d674ce1a5e99e0ba2d749f9-tm-dev" into tm-mainline-prod am: 007cc803

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



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