Merge TQ2A.230405.003 am: 5642b7f072

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

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