Merge "Integrate in cl/356241895 into testRcsApp" am: 1c671cb3c2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99623e87a42e3fb8b175049ff210b85eec61345e