Merge changes from topic "presubmit-am-b4684881f5114426ab01cb0b269cd1a7" into...

Merge changes from topic "presubmit-am-b4684881f5114426ab01cb0b269cd1a7" into tm-mainline-prod am: 70415743

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



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