Merge "[RCS UCE] Fix the callback onRcsConnected won't be called" am: 3f35489be6 am: 7c2452022f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d831d1c6fe0b42cbacb39a79da67be848538213