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

Merge changes from topic "presubmit-am-d8547854979441938c333229a7207493" into tm-mainline-prod am: 8abf00a9

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



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