Merge TQ2A.230405.003 am: 5642b7f072 am: f63569cd3a

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

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