Merge changes from topic "rcs_test_client" am: e0bed56ced am: 1e3b4c27c0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ce31585c308b427a516ba803ff2c7143355cd12