Merge changes from topic "presubmit-am-e31a34fa6fda48f2be09bcf30fee1e73" into sc-mainline-prod am: d343680a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/15743271

Change-Id: If334e263d35336450910ccbc52c382d8b12bc24b