Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into sc-mainline-prod am: fba8d97c

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

Change-Id: I66da94766b24f0d6ecb581a117d395b9348b655f