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

Merge changes from topic "am-bb24f2ed044d4827bda50ebd8e295b38" into udc-d1-dev-plus-aosp am: c9df15f7

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



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