Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into sc-dev-plus-aosp am: bc4cdf52

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

Change-Id: I8a7283e8ff6ee0498151e978d0277ab5c61723e6