Merge TQ2A.230405.003 am: 5642b7f072 am: f63569cd3a am: 2e6c9aaf12

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

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