Merge cherrypicks of [16373492] into sc-qpr1-release. am: 97d6fe61f2

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

Change-Id: I33ee42be14e5f4203bc143a15fa18adca5af06dd