Merge changes from topic "rcs_test_client" am: e0bed56ced

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I086fedc8fd59097aa83e3c34e7d648e1c01712de