Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into...

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

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

Change-Id: I6137a4c916f6ed9d970f6f31887cb981e07f1ab7