Merge changes from topic "rcs_bearer_ip" am: a599bb65fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fb408cea934a658fdf966246af5c3a44c11dea0