Merge changes from topic "presubmit-am-4a196505e7784256b7c2d4af8313e491" into...

Merge changes from topic "presubmit-am-4a196505e7784256b7c2d4af8313e491" into sc-qpr1-dev am: 12efaeb7 am: e5aa3d02 am: 879cff92 am: 7af03bad am: d4236896

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

Change-Id: I3a685c41b776046b9688cedeab33b830d02de056