Merge cherrypicks of [17104573] into sc-v2-release. am: 40b73e5d31

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

Change-Id: I8f579e6d06edddd17af7ef046fec6ac8085e62ba