Merge changes from topic "presubmit-am-4a196505e7784256b7c2d4af8313e491" into sc-mainline-prod am: ff0ffa5d14

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

Change-Id: Ie5d15827b7ab1c1fa4f9d0a7e7111d8ca1c52363