Merge changes from topic "presubmit-am-1f01c9dc2f8f451491b98b0795465b8a" into sc-mainline-prod am: 59ef031e08

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

Change-Id: I9bf2910a51c32214c95b872dd19d12249d4f77cf