Merge changes from topic "am-d3660a660b194da995f62a33a97e6a06" into...

Merge changes from topic "am-d3660a660b194da995f62a33a97e6a06" into udc-qpr-dev-plus-aosp am: 75cf27f5

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



Change-Id: Ibb8f96501490e0006551a71ec2cabd5b125becfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>