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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I122d3f3ab30804a16d07195857d7c7bd824e636c