Merge changes from topic "rcs_bearer_ip" am: a599bb65fc am: 4ba63d47bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbf8c3b06adeb9372fd2515d560cebcf3af5564f