Merge changes from topic "presubmit-am-8424428ed6224c37a73d80ed9709589d" into sc-qpr1-dev am: e5e79a46c4 am: 40dac02085

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

Change-Id: Ib46db16e9dd0fbc99cdd5e48c52ebeb2f1e240b0