Merge changes from topic "tc_change_23050307_32" into udc-dev am: 373c8d2e7a

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

Change-Id: I6bb2073a42abf87179779de2d16638f9f861869a
Signed-off-by: Automerger Merge Worker <[email protected]>