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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5e19f3bb2d2f28c70afbca6b0c8230a7fb893c3