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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07b88bcf6c1e65430143625384c3abe4475d2a1e