Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp am: 9d48bc4f0f

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

Change-Id: I50eca593f96e3f1edeefe5973cd8d0850022a4c5